Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 06:19:35 +0000 (23:19 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 06:19:35 +0000 (23:19 -0700)
commitf573f84808beca9613b36aa1f30324b0cf11b806
tree6ea6b65d7761b9dcc3f1800aae603b2d65f87a84
parentae42393d2133c9393ea9bf82e4b3c745e4fecdd3
parent92aa5bcd57ef861363d0989c03129127b8903157
Merge from trunk.